0000000000000000000000000000000000000000 ad971c1a468195ebf7458c209b58faffdc345566 Cody Paterson <cody.paterson@gmail.com> 1517081163 -0800	clone: from https://github.com/tsai0606/DisgruntledEmployee.git
ad971c1a468195ebf7458c209b58faffdc345566 ca7ca93cb239025c2552fface24757096d5596ea Cody Paterson <cody.paterson@gmail.com> 1517086030 -0800	pull --no-rebase --progress origin: Fast-forward
ca7ca93cb239025c2552fface24757096d5596ea e84adaf53f633cb05e36d35c0fc390370b55fd59 Cody Paterson <cody.paterson@gmail.com> 1517090784 -0800	pull --no-rebase --progress origin: Fast-forward
e84adaf53f633cb05e36d35c0fc390370b55fd59 67d4341b920f9cb490246ee858c53d40780cc2a9 Cody Paterson <cody.paterson@gmail.com> 1517091447 -0800	reset: moving to origin/master
67d4341b920f9cb490246ee858c53d40780cc2a9 025411d79566886883e6a92e358fa9e5857449d5 Cody Paterson <cody.paterson@gmail.com> 1517091697 -0800	pull --no-rebase --progress origin: Fast-forward
025411d79566886883e6a92e358fa9e5857449d5 1b48ff8f3899c67d78520bf04ccdaf561fe75eb7 Cody Paterson <cody.paterson@gmail.com> 1517091773 -0800	commit: Merge branch 'master' of https://github.com/tsai0606/DisgruntledEmployee
1b48ff8f3899c67d78520bf04ccdaf561fe75eb7 6cfecad5a8d9981e54119b7aa6aa4e1506d4089f Cody Paterson <cody.paterson@gmail.com> 1517095382 -0800	commit: small changes to pathing test and character path prefab
6cfecad5a8d9981e54119b7aa6aa4e1506d4089f 74a9a59cd1726d37ec815e0fdcadd1dce6755c15 Cody Paterson <cody.paterson@gmail.com> 1517095437 -0800	commit (merge): Merge branch 'master' of https://github.com/tsai0606/DisgruntledEmployee
74a9a59cd1726d37ec815e0fdcadd1dce6755c15 2fb8312b748a4ffcc072e1adb6240d1c7cd9306c Cody Paterson <cody.paterson@gmail.com> 1517095929 -0800	commit: set up small map test
2fb8312b748a4ffcc072e1adb6240d1c7cd9306c 0c171d4d997c01dc3c906769d5ad49228864fd56 Cody Paterson <cody.paterson@gmail.com> 1517098505 -0800	commit: added more character paths
0c171d4d997c01dc3c906769d5ad49228864fd56 4e5fbfa0d54d73e1f87643f3907b33be5c26ef54 Cody Paterson <cody.paterson@gmail.com> 1517098510 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
4e5fbfa0d54d73e1f87643f3907b33be5c26ef54 0396bf5ace037f4aeae1c930583ef68011204d4d Cody Paterson <cody.paterson@gmail.com> 1517100858 -0800	commit: character pathing complete
0396bf5ace037f4aeae1c930583ef68011204d4d 17d97ebda2b3440b3f1627b270a22138fc31111f Cody Paterson <cody.paterson@gmail.com> 1517101207 -0800	pull --no-rebase --progress origin: Fast-forward
17d97ebda2b3440b3f1627b270a22138fc31111f 5db3f7dd9287a03853b42f35f011061358d786ea Cody Paterson <cody.paterson@gmail.com> 1517101479 -0800	pull --no-rebase --progress origin: Fast-forward
5db3f7dd9287a03853b42f35f011061358d786ea 129e87847137195949cc902ba45e9c850a436d64 Cody Paterson <cody.paterson@gmail.com> 1517102601 -0800	commit: added breakable apparel objects
129e87847137195949cc902ba45e9c850a436d64 0f642081a456dc93c50e79d8e45b05b765a6c76c Cody Paterson <cody.paterson@gmail.com> 1517103094 -0800	pull --no-rebase --progress origin: Fast-forward
0f642081a456dc93c50e79d8e45b05b765a6c76c dd076ccc569edd9163a87d9f45b28843771d1c9f Cody Paterson <cody.paterson@gmail.com> 1517104726 -0800	commit: added lamps prefab, added lamps and cash registers to map
dd076ccc569edd9163a87d9f45b28843771d1c9f 1b35eebd4f73e84245db7137b783fb4b6f61efd0 Cody Paterson <cody.paterson@gmail.com> 1517104728 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
1b35eebd4f73e84245db7137b783fb4b6f61efd0 2ee5f50941ea0390dfba3476abe500969c706ed5 Cody Paterson <cody.paterson@gmail.com> 1517105535 -0800	commit: updated map test
2ee5f50941ea0390dfba3476abe500969c706ed5 b2a1f2f421513aea42ead28f5abb6032be1b8f4b Cody Paterson <cody.paterson@gmail.com> 1517106263 -0800	commit: added background to pathing test
b2a1f2f421513aea42ead28f5abb6032be1b8f4b c4b2cafd2e08d278a435f91a8150c76a8a4dac7f Cody Paterson <cody.paterson@gmail.com> 1517107979 -0800	commit: added lots of sprites
c4b2cafd2e08d278a435f91a8150c76a8a4dac7f c8501dab24e25c45fb12d46af8cfd316211a5915 Cody Paterson <cody.paterson@gmail.com> 1517107984 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
c8501dab24e25c45fb12d46af8cfd316211a5915 b8648c1c202ff91e5be5e72bcafa2f388eca21da Cody Paterson <cody.paterson@gmail.com> 1517108160 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
b8648c1c202ff91e5be5e72bcafa2f388eca21da 2ed9508dcd4b5df9b429636f523ae762ecbc6a68 Cody Paterson <cody.paterson@gmail.com> 1517108559 -0800	commit: added worth values to all breakable objects
2ed9508dcd4b5df9b429636f523ae762ecbc6a68 52793afa84d201cfee91139084036c920569f8b9 Cody Paterson <cody.paterson@gmail.com> 1517108561 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
52793afa84d201cfee91139084036c920569f8b9 3d569cc3eb77ab7a1f165e53f39356faa785fa4c Cody Paterson <cody.paterson@gmail.com> 1517109466 -0800	commit: added groceries
3d569cc3eb77ab7a1f165e53f39356faa785fa4c 9d0fce4c041ffefa00a1ab1795bde1e41335f5d8 Cody Paterson <cody.paterson@gmail.com> 1517115923 -0800	commit: various sprites, filled map to completion.
9d0fce4c041ffefa00a1ab1795bde1e41335f5d8 666de5b69d4ba171108e23b0f38751526853da20 Cody Paterson <cody.paterson@gmail.com> 1517115926 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
666de5b69d4ba171108e23b0f38751526853da20 278b0fd2d94f5053d6f6f421bd3376893aede6c5 Cody Paterson <cody.paterson@gmail.com> 1517117676 -0800	commit: set up pillows, various colors of shoes, more clothing racks
278b0fd2d94f5053d6f6f421bd3376893aede6c5 966f4f05a24ee5bd032354d0911e2c25528db319 Cody Paterson <cody.paterson@gmail.com> 1517117682 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
966f4f05a24ee5bd032354d0911e2c25528db319 8481e81eaf4c1efc30b4d580066561cb5b852518 Cody Paterson <cody.paterson@gmail.com> 1517121388 -0800	commit: made walls, built walls, communism
8481e81eaf4c1efc30b4d580066561cb5b852518 a5d164997388d361ec2e2133767df64a5500ccf8 Cody Paterson <cody.paterson@gmail.com> 1517121397 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a5d164997388d361ec2e2133767df64a5500ccf8 d46fa71629364b764d6c202ecfba457155d0760f Cody Paterson <cody.paterson@gmail.com> 1517122192 -0800	commit: added stuff to pathing map test to make it work with anims
d46fa71629364b764d6c202ecfba457155d0760f a31cfd0cfd8e497703dca221e90c94b9f972bbf5 Cody Paterson <cody.paterson@gmail.com> 1517122197 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a31cfd0cfd8e497703dca221e90c94b9f972bbf5 0fa5a54fe89198afc60e621aa77c4da7192971d3 Cody Paterson <cody.paterson@gmail.com> 1517122661 -0800	commit: test
0fa5a54fe89198afc60e621aa77c4da7192971d3 da2b482f2ed45344e9eaf0f753ce1e1d8af7bf84 Cody Paterson <cody.paterson@gmail.com> 1517122824 -0800	pull --no-rebase --progress origin: Fast-forward
da2b482f2ed45344e9eaf0f753ce1e1d8af7bf84 f2456fa97f064b61748a08af5815ae9d39db892a Cody Paterson <cody.paterson@gmail.com> 1517163633 -0800	commit: added mirrors and side walls
f2456fa97f064b61748a08af5815ae9d39db892a 805b3de4a1c1502201c36810513ac51ae920dd3e Cody Paterson <cody.paterson@gmail.com> 1517163634 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
805b3de4a1c1502201c36810513ac51ae920dd3e 3fb7e3bab3730106bc7e0513f01484209afd828f Cody Paterson <cody.paterson@gmail.com> 1517165253 -0800	commit: fixed some graphical bugs
3fb7e3bab3730106bc7e0513f01484209afd828f b50dd6645e488cdeeceed7e98249fe73cefd8a41 Cody Paterson <cody.paterson@gmail.com> 1517167509 -0800	commit: tweaking infection timing + size for gamefeel
b50dd6645e488cdeeceed7e98249fe73cefd8a41 eac2a2ce43188a59996329ec82dd53b5ae79e8fe Cody Paterson <cody.paterson@gmail.com> 1517167510 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
eac2a2ce43188a59996329ec82dd53b5ae79e8fe 101f9f650be3d9d568f76c9e7b235f807ade483c Cody Paterson <cody.paterson@gmail.com> 1517168862 -0800	commit: number tweaking for balance
101f9f650be3d9d568f76c9e7b235f807ade483c 13baf4074b53512e37d52b2a7a7353742c1f0772 Cody Paterson <cody.paterson@gmail.com> 1517168864 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
13baf4074b53512e37d52b2a7a7353742c1f0772 0ad1df796b7f595c7512feaec0e2880b6e858253 Cody Paterson <cody.paterson@gmail.com> 1517169085 -0800	pull --no-rebase --progress origin: Fast-forward
0ad1df796b7f595c7512feaec0e2880b6e858253 3e67ed70d3360ad467249905eeeb8ba690597bbc Cody Paterson <cody.paterson@gmail.com> 1517170177 -0800	commit: more tweaking
3e67ed70d3360ad467249905eeeb8ba690597bbc fd52a698eed33a29bcc4a7f64d3c39141824d378 Cody Paterson <cody.paterson@gmail.com> 1517170179 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
fd52a698eed33a29bcc4a7f64d3c39141824d378 b1188d619ba35bbacba1aeefb4037f3b9f6fcb9b Cody Paterson <cody.paterson@gmail.com> 1517170449 -0800	commit: updated map in main map
b1188d619ba35bbacba1aeefb4037f3b9f6fcb9b 7aa104d897eb425d7fbbd46348c8cb415402f9cf Cody Paterson <cody.paterson@gmail.com> 1517171524 -0800	commit: removed blast radius indicator (orange circle, i just turned the alpha down to 0)
7aa104d897eb425d7fbbd46348c8cb415402f9cf e3da1c267417b6b65bf142fbb899f48502dcdb23 Cody Paterson <cody.paterson@gmail.com> 1517171643 -0800	commit (merge): Merge branch 'master' of https://github.com/tsai0606/DisgruntledEmployee
e3da1c267417b6b65bf142fbb899f48502dcdb23 dd76f6d6ce3e03b139b8e3ba6cae2f5a48c61ea2 Cody Paterson <cody.paterson@gmail.com> 1517171769 -0800	pull --no-rebase --progress origin: Fast-forward
dd76f6d6ce3e03b139b8e3ba6cae2f5a48c61ea2 a1b9f71367c2b0de977f9351bbd2be3aa1e5e09d Cody Paterson <cody.paterson@gmail.com> 1517173318 -0800	commit: made some small tweaks and made things look nice
a1b9f71367c2b0de977f9351bbd2be3aa1e5e09d 9e814a5bb9e1e8a559f62596595034d94f8fc2e3 Cody Paterson <cody.paterson@gmail.com> 1517173320 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
9e814a5bb9e1e8a559f62596595034d94f8fc2e3 6b0a73a5316d4e6f02d7f8f01cccd0e96c8e04ca Cody Paterson <cody.paterson@gmail.com> 1517173998 -0800	commit: visual tweaks
6b0a73a5316d4e6f02d7f8f01cccd0e96c8e04ca e2b688d6446808c89fcef07e9ab9d4e2cf0e6977 Cody Paterson <cody.paterson@gmail.com> 1517175160 -0800	pull --no-rebase --progress origin: Fast-forward
e2b688d6446808c89fcef07e9ab9d4e2cf0e6977 632f5d19f6601a10d693af2f734e4583b36fc135 Cody Paterson <cody.paterson@gmail.com> 1517177759 -0800	commit: fixed some small visual bugs, tweaked a few numbers
632f5d19f6601a10d693af2f734e4583b36fc135 f75af505c3ffbfebe82740d2c05e5db4ab06f4cd Cody Paterson <cody.paterson@gmail.com> 1517177771 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
f75af505c3ffbfebe82740d2c05e5db4ab06f4cd b2ac00f9ec0dca150fdb0c4bf22ec8ce5ffd530b Cody Paterson <cody.paterson@gmail.com> 1517179180 -0800	commit: tweaks with text, balancing
b2ac00f9ec0dca150fdb0c4bf22ec8ce5ffd530b a9300c3183afe30a4895c4d07f488dd6ec8c5184 Cody Paterson <cody.paterson@gmail.com> 1517179625 -0800	pull --no-rebase --progress origin: Fast-forward
a9300c3183afe30a4895c4d07f488dd6ec8c5184 fe31d2158beb17348469ffb1e174ee1edc691780 Cody Paterson <cody.paterson@gmail.com> 1517179802 -0800	commit: tweaked object positions
fe31d2158beb17348469ffb1e174ee1edc691780 a5c7af9d64f14656fbe0fa1979e2fbd3456e45ca Cody Paterson <cody.paterson@gmail.com> 1517179806 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a5c7af9d64f14656fbe0fa1979e2fbd3456e45ca 7ad21dffeb9140392d4a3320970a97d5fafb19ea Cody Paterson <cody.paterson@gmail.com> 1517181444 -0800	commit: balance tweaks
7ad21dffeb9140392d4a3320970a97d5fafb19ea 2a3ba33d36b3ea6b18bd44199c4b30e174666ddb Cody Paterson <cody.paterson@gmail.com> 1517181449 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
2a3ba33d36b3ea6b18bd44199c4b30e174666ddb 76e495d2d07a60a338b8e8b8a2bf00b996d25cdd Cody Paterson <cody.paterson@gmail.com> 1517182582 -0800	commit: tweaks
76e495d2d07a60a338b8e8b8a2bf00b996d25cdd a73199ad2da825e3d72d7bec69efdd88a853447a Cody Paterson <cody.paterson@gmail.com> 1517182586 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a73199ad2da825e3d72d7bec69efdd88a853447a 17157cbd1dd8ec17f15ce6317091bde353515501 Cody Paterson <cody.paterson@gmail.com> 1517183152 -0800	commit: lowered explosion audio
17157cbd1dd8ec17f15ce6317091bde353515501 a1e985a07ff97cad0fe2ad442e25ee414b0dc7e7 Cody Paterson <cody.paterson@gmail.com> 1517184327 -0800	pull --no-rebase --progress origin: Fast-forward
a1e985a07ff97cad0fe2ad442e25ee414b0dc7e7 f750a5c36f19bdb0eb172ab386b36095c02abf14 Cody Paterson <cody.paterson@gmail.com> 1517188789 -0800	pull --no-rebase --progress origin: Fast-forward
